Add more comments to tests
More code cosmetics cleanup
Fix saving map