Trying to fix unit tests