Clean up formatting of basic mapping tests