fix
added some more tests
some more tests