fix resolver, and make sure cluster kitchen exercises that code