Addded new test framework