Minor refactor of tests.