Fix and extend test conditions
Fix and extend test conditions

sorgerlab/indra,bgyori/indra,sorgerlab/belpy,johnbachman/indra,sorgerlab/indra,sorgerlab/belpy,bgyori/indra,sorgerlab/indra,bgyori/indra,johnbachman/indra,johnbachman/indra,sorgerlab/belpy