Move to testing framework?