Added some more tests and fixes