QA fixes on a few tests

was tired of seeing these show up every time I ran tests on my dev machine...