Trunk-4116 New changes in the code

I added few tests and some code to avoid returning of the retired drugs.