Review comment test case and fix @passwd reference