Remove useless tests
Update methods in UserManager to add better filtering