Clean-up a test. Simplify some supports logic.