Merge "Add missing CLI Neutron tests"