Updated autotest to conform changes due to #296.