Update written tests from tests added after the branch
Add failing tests for non-converted and update others
Delete DOH tests that have been converted