Cleanup
Fix test, add required shibboleth cookie