#2 - default roles, code re-factoring and more tests.