Fixed crit test problems
Merge branch 'master' of github.com:rwfeather/autotest-sp2