Get rid of unused Exchange factory functions
Fix integration tests.