Fixed a tester problems; more debugging