Partial commit: Tester fixed, acceptance tests on the way.