Added some more tests, that aren't passing