Repair some tests. #159
Merge branch 'feature/fix_regression_tests' into develop
Merge branch 'feature/admin_browser_test' into develop
Corrected test according to spec. #170