One more attempt at fixing unit tests