modified tests, still not passing