Bug 19893: Fix tests and add tests for joined subfields