dirty commit, reworking exchange tests