Improved Getters/Setters with tests