Modified testingAPI