Fixed merge error (missing , in array and layout.ejs JS lib)
Fixed problem with test