Merge Fixes for Issue #16

Change the drug trial test name order by organ, test type and test name