fixes for test failures from #171