Renaming controller
Advanced test output