This PR is one fix of many for Refactor EXO Unit Tests #1111 And other problems with unit tests. One fix for all.#1162