fix all broken tests after modules have been applied