Test reorgs

Make tests repeatable and addition of new tests