Added tests, and modified command