Minor changes, some work on the tester