Minor API tweaks as a result of thinking about tester design