some fixes for the org test cases