Some cleanup for testing