Refactored response spec validation a little bit