fix some tests and use of users field