fix tests
fixed all tests