Resolved task
Added tests