Fix broken test

This code is fucked up, I have no idea what it is doing. Will need to
rewrite
Upgrade test suite's resolver to the working one
Index module