Better resolving for tests