Added tests for #69