Add some more tests and remove duplicates
Add some more tests and remove duplicates

As added in https://github.com/dimagi/commcare-hq/pull/17000
dimagi/commcare-core,dimagi/commcare-core,dimagi/commcare,dimagi/commcare-core,dimagi/commcare,dimagi/commcare