Skip all but first test.

This skips all but the first test and while I was in there, I decided to tidy the API a bit.