Added tests. Fixed commands.