CDI-414 Support for self injection [Tests]