fix untilResolved test and bug