* Clean up some tests