Add ability to filter by species model, with tests