fixing more tests, started on partial trust