test and header fixes
Merge branch 'request_engine_overhaul' of github.com:jacobb/nap into request_engine_overhaul