Improve handling of test command shortcut. Relates to #11.