Added test framework and structure