Add testing of controller startup.
a little more cleanup.