Minor refactor in test setup