fixed all tests
merged