Added some more comprehensive tests
Bit more code