Added more tests

And cleaned them up