restoring conrad's original set of tests inadvertently smashed