Testing: Some cleanup