More integration tests reorganization