A bit more bulletproof testing for #25