Tester small fixes