Remove two no-longer-working test files. Add a preInclude for running overlap checks, based on changes from @hhayward.
FYI @nreadiof