Make tests more portable. Prepping for initial CI use.