Updated test framework and added tests

no need for this header