Attempt to resolve the unit tests