Adding tests for endpoints utilities, coverage is above 70%!