ticket:9 Added implementation of command, fixed tests