Add Output Tests
Modify controllers and plugins
Fix tests