fixed user profile test
Merge branch 'olegsbranch' into develop