Clean up some serial tests