This includes one that is actually broken (its loop is not iterating).
Also tighten the unit test a bit.