savepoint before auto generate matchers
Integrate with 2.0.1 of TestFirst, using the generated matchers (remove our own). Test resources are now in folders with the same name as the test class.