refactored command_methods, updated tests