Removing duplicate controller tests, fixes #9490