Replaced some functions from repository to weblocks-utils functions, added test