Made changes
Make tests pass