Renamed user attribute name to user_name
Fixed tests for name change and fixed a couple issues
Merge branch 'development'