New tester, much nicer now