* more tests
* bugfixes