Add tests for Species and correct Species accordingly