Merge "Port  API Tests Enhancements"