Refactor test
Add helper func to set logged in user in lib, for tests
Refactor
Merge branch 'master' into builds
7.393