changing test to function. cleaner that way.
Merge branch 'custom-commands-fix' into mobify