Resolves #4708 - static runOnce causing subsequent tests to fail, additional refactor