fix unit tests again