updated test suite + explicit version