Remove redundant test and add more user-model tests