Uncommented map tests, added missing goBack()