refactoring integration tests, so we can code sign them