Changed approach to testing framework, should be working now