Ignore autoenv
Cleanup and simplify tests