Remove redundant variable.
Cleaning up magic get and set, adding more tests.