Added tests for #5