Fixes after review of new Work code
Update User tests with improvements from Work tests