Trying to fix the unit tests