OK, I'll make the tests less verbose as a general cleanup.