Added tests for user-role assignments
Fixed issue in tests
Updated grammar

Added references from users to existing roles