More unit tests; added 'shorthand' behavior