remove and some more tests
more tests