Clean up testing code