Fixing broken tests from e0570c6