Split a test() in two to address a comment by jgraham.