added tests
Merge pull request #1310 from jay-hodgson/SWC-1876

added additional tests