(#1463) - Bail tests on first fail, and make vars configurable