Making CDI and tests work