Fix ordering of stub data
Don't check data so aggressively