Finally fixed all tests