Improved the testuser-setting code to try to get it to work