fixed tests
-1 (improve unit test)