Update the Abstractor Mappings to be more robust when a new OS comes out that has not had values updated in the Mappings file.

Also add tests to ensure that this works properly.