Fixed more user tests, they are doing nicely