Added lazy shortcut
Added tests