Another attempt at fixing the broken tests