Make tests easier/clearer to run