Fix some tests for guards