Remove unnecessary usage of OrderedSet from Nested field

Also expand upon unit tests for ordering with Nested field's