Move response validation into validate