Merge "Update tests to use new netconf sim"