Made all tests green again