Added some more tests, made some pass