added unit test for commands
removed conflict