more fixes and updates to the users module & tests