Actually fix unit tests