Additional test and minor fix for exchanges