tempest plugin update

Fixed two little bugs in tempest plugin and added two cli tests.

Change-Id: Ia5cb947c29c736a81e31a28a46d84e3941c66776