Further Updates to testing API