Dak requests

Contains test adjustments and data structure requests from @dak1.