Minor refactor on core tests.