consolidate and filecheckize two tests.