Further split out of logic
Tests for requests builder

Fixed bug when no requests