Unity tests, Unity fixes