Added tests for #8.