code review changes and get all _buildPayload() tests working @coryvirok