Added tests for #6