Attempting to move toward working PS1 test
Revert "Attempting to move toward working PS1 test"

This reverts commit b68665949f9b96005337296589c9f3a130dd0858.
Tests are lining up, yey =D