Fix test framework