Changed to add API testing