Fixed the testing framework