Papyrus test refactoring