More attempts to fix unit tests