Added drag to the graph test at Tyson's request and made a minor
restructure.