Fixed tests not passing