Fix character encoding problems in test data
Change map:contains test, NaN now allowed as key