Cleaning up DOI behavior

@WIP - This test is likely broken but I'm needing to head home.

Will work on it later tonight.