Fix iheart controller. Add more tests.