Added test framework