fix(resolvers): resolve #1142 name issue and add relevant tests

[AvKat]

This PR fixes the issue mentioned here with tests as mentioned here. The tests successfully fail when the startsWith is replaced back with includes.

(Edit: The second 'here' is supposed to link to the last comment of the mentioned issue but it's not scrolling.)