closes #3447
closes #3445 and fixes test user roles
Merge pull request #10 from jdcc/dev

Couple small test data issues