Made tests pass