Moving PIF MO and unit test consistency.