Code cleanup
Add restify cli test