Added tests for DrugOrderHandlerTest
Code cleanup