Minor refactoring of the full controller test
Extracting species (again) as a first class concept