Fix tests (without any tests for infoMap)