Passes unit tests again