Refine extended resource framework fix and enhance tests