Fix most NameControllerTest offenses
Fix most NameControllerTest offenses

JoeCohen/mushroom-observer,JoeCohen/mushroom-observer,MushroomObserver/mushroom-observer,JoeCohen/mushroom-observer,JoeCohen/mushroom-observer,MushroomObserver/mushroom-observer,MushroomObserver/mushroom-observer,JoeCohen/mushroom-observer,MushroomObserver/mushroom-observer,MushroomObserver/mushroom-observer,MushroomObserver/mushroom-observer,MushroomObserver/mushroom-observer,JoeCohen/mushroom-observer,JoeCohen/mushroom-observer