Added tests for expand in Exchange