Fixed commands
Added tests