Next attempt at fixing the unit tests