More specific controller action return types

- Change controller action return types to more specific ones, mainly to
remove unnecessary casting in tests.