Fix attempt test to reflect housekeeping.

Also, increase the granularity and completeness of that test.