Fix up Sandal for testing