The @ShouldThrowException assertion for a deployment should support more intelligent exception matching similar to what was implemented for Seam Catch. A single exception class compared to the outer most exception often isn't sufficient. If nothing else, we should unwrap the exception and try the match for each exception in the stack.