Merge "Add skip for api tests"