Breaking apart tests per feedback

and consolidating load path appends into a single for loop.