CDI Test extensions, and support for later versions
dependency cleanup... maybe