Fix tests and small bug in help message

Change-Id: I7ad30a33a138e5adcb219ec1e0738704ffe5ce82