Start of removing extraneous functions from functional cli tests