Fixed tests so it uses new map system with String