some more tests
bugfixing