refactored some more pss scenarios after defects were closed