Unit Test Tweaks