Merge "Improve code coverage of A1 controller"