Change to using doseq for tests