ENH: improve tests
ENH: smarter API + advanced condition handling