Adding even more tests and getters