#187 - improvements to test framework (wip)