Fix type for ui router's State.resolve.
Fix type for SpyAnd.