intermediate commit; some fixes on test case (clinical)