removed types usage and added test coverage (work for #3986)
2 files changed