Merge "Add tap-as-a-service API tests"