added some fixes to improve performance of desmond -> others unit tests.