Added more tests
Reindented