Added more tests

Check me?