Clean up remaining tests