Continuing to evolve testing framework