Starting Test
Make Generic Type maps work without breaking any of the pre-existing tests