Tiny adjustments to tests