fix tests
Merge branch 'develop' into feature/krb-import