better organization for integration test support classes