Added CreateExchangeCommandTest and refactored to clean tests up a bit more.