Updates to test framework