Fix some broken tests in empty new environments