fixes for username issue in testcase