more refactoring
fix presenter test
Fix unit tests, relax role tests and use DB defaults