(module test-extras (test-error*)
  (import (chicken base)
          (chicken condition)
          (chicken syntax)
          scheme
          test)

  (begin-for-syntax
    (define-syntax transform-condition
      (syntax-rules ()
        ((_ ?kind) (?kind))
        ((_ (?kind ?properties ...))
         (?kind ?properties ...)))))

  ; Based on the commented-out `test-error*` in the `test` egg
  (define-syntax test-error*
    (syntax-rules ()
      ((_ ?msg ((?kind ?properties ...) ...) ?expr)
       '(?msg ((?kind ?properties ...) ...) ?expr))
      ((_ ?msg ?condition ... ?expr)
       (test-error* ?msg ((transform-condition ?condition) ...) ?expr)))))