Add some more degenerate tests
Simplify the one-shot methods to single loops