Adding more docs

IN-393
Fix broken test on servers controller

IN-266
Code cleaning

IN-266 IN-393