Hotfix - Refresh state, friendlier tests