more test framework work