Merge "Add unit test for A1 client"