Made several changes to schemas and tests so they operate more as expected.