Added tests for #128