Added tests for #92