Merge "add CBR service unit test to MTS"