TestDriver support, closes #3