Update type tests for ordered maps, sets

Related to changes in #33