Do cleanup only if we are using the template
Adjust import test to new test data