StructToMap, refactor tests.