Added Exchanges and tests