add more tests
+ bugfix