Create basic commander
Fix tests