Merge branch 'hotfix/database-session-tests'
Fix more session problems in controller tests, also make tests aware of the site alias
Merge branch 'hotfix/fix-all-tests' into develop