added regression test for #214
added regression test for #288
Merge pull request #293 from bsuh/regression-tests

Regression tests #214 and #288