Test problems remain. Client gateway for named functionality

Change-Id: I23024f76b3c2699b60b07de0b73ff347009c5199