Added UsersTableTest + fix few bugs