Improving ampersand support + test for CLI version