Merge "Improve neutron CLI existing tests"