Add clean command
Add tests for commands