Fixing tests, PSM and settings pane

- resolving test failures where number of tests changed
- fixing issue with PSM label
- re-removing app settings screen code