Jay: Various changes to getter/setter, Removed “else”, test cases changed.