More tweaks to get automated test running working.