fixed all tests except a few