[WIP] Unit Test Improvements

I'm curious about these comment-outs. We should have some assurances that each test case will be starting from a clean slate. How will that work for these tests?