moving to testing framework