Update tests and expose getters/setter properties