PM: Refactoring & test bug found/fixed