TRUNK-4145: remove drug.concept restriction and add some unit tests