Added tests for #220