unit test fixes and logical cleanup for OEP-27969