refactored some PSS scenarios and began work on pic library sptest scenarios