Fix first version of test framework