Made all tests pass