Updated with the latest API testing