Added refresh query tests including two that fail D#2655