make test-cleanup test more robust by ensuring all expected files are first created