Added tests for #2