PM: cleanup - fix tests