Revert "Resolve tests"

This reverts commit dc20d58929185f6caf26d4db640abd7f1b88cf98.