WIP: Improve test framework