updating ps to include state and fixing tests