Cleaning up the tests a bit, including removing some auto-generated no-op controller tests. (Leaving the door open for richer controller tests in the future.)