Modify controller tests to remove indexing; tweak controller to make tests pass