Add controller tests
Add hedonics