Clean up more test