Improved my user unit tests a bit