Fixing execution tests and testSearchMigrationFiles result

Hope this help.