Fixed tests broken by removal of getters and setters.