Minor refactoring; trying to make the actual test more apparent.