Tests not passing
Updated tests