Variable visibility: "protected" -> "private". Had to delete a few trivial tests that accessed the fields.