Refs #4319 - Simplify and add the new wrapper bundles to the tests