REALLY fix test user names and passwords

I changed the usernames and passwords in one location, but not the other
one, and it was the other location that was currently being used in test
code. Now changed in both places.