fix test_work_schedule so user entity is consistent

can't assume the user selected will be any specific user, so we must make the assertions compare with the user data that was originally returned.
Merge branch 'master' into 15877_nested_queries