Added some getters
Fixed test suite