Added test framework classes