[WIP] Unit Test Improvements

Accidentally left behind, please remove.