Add test for commands
Fix CommandEvent