Slightly tidier tests.