Added new test framework