Getting more test framework in place