Fix tests for latest guard