Fixed errors to make first 4 tests pass