Added one more test
Minor refactor
Progress on roles