Fixed bad merge + added tests for Shibboleth