improvements to auto-testing