fix unit tests (again)