V 0.0.21 - Short syntax. Updated test cases to suit short syntax.