Fix tests

Tests were broken since we changed the default behavior.