added the testing framework again