fixes #182 and adds extra tests for combined syntax.