Fixed User tests (hopefully for good this time)