Further cleaning up/strengthening of tests. Including SessionHelpers