Shorten the display of functor module types
Update the tests with the shorten functor module types