fixing partial trust and related tests.