Minor refactor of test setup for strict mode