Clean up some tests