Commit from lap
Added test