Testing: Fixing bug where specifying data_marker_* was obligatory, also streamlining that process