BVTCK-45 Splitting CDI tests into packages