Merge "Add unit test for StdA1Client"