fix tests, tests fixed some bugs => I should write more tests