updated tests where maps were not at the end of a line
updated regex to look for base64 strings explicitly
update tests for map comments to be more robust