Fix insulation so that skipped tests work properly