Fixed some more tester issues