Added tests for #134