Cleanup unit tests a bit