Add shorthand tests