updated test framework