Removed ExtractHeaders func
Added checkin tests