Added tests and update cmd