fixes #81 (and adds support for TestbedTimer)