Refactor

Test controller
Line is too long. [83/80]