Fixed the unit tests again