Work on testing framework