Rake tasks; refactored command & specs