Made changes to testing framework.