Try to fix unit tests