Fix the unit tests, then disable them; Fix the CommandLineUtil.cs location