Updated Map/Set subtest results.

This also puts Map#size and Set#size into separate subtests.