fixed Users unit tests
merge master