rewrite test suite to support check-expect conventions