Fixes to command line interface, plus removed an impossible test case