Added more tests
Moved some test specs around to simplify things