Added the long form shortcuts by default. Added test to ensure that we are able to handle long form arguments