Fix merge issue
Added tests for #27