Added more tests and getters