Convert some tests to use spies instead of mocks to avoid some very brittle code that was broken by fixing ISPN-3133