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