Added some more tests

Why not