Corrected getters and setters and connected tests