Merge "Update service test runner to allow test args"