Moved message outputing to command
Fixed bad method call
Fixed broken test