Minor refactoring of existing frontend tests.