Small shortcut refactoring, tests added.
Merge branch 'master' of github.com:Melevir/ruby-phabricator