Rename plural controller to singular. Avoid silently failing tests