Added tests for #692