almost fixed all tests