Don't add run_tests target if we're not toplevel
By default, don't armor containers if not required
Track Catch upstream