Various cleanup on tests