fix for empty req headers & more tests