Added some more tests and modified tested methods accordingly