Attempting to fix some tests that started breaking...