Reorganizing slightly around new integration tests