CHLOE | Fixed menu tests
CHLOE | Fixed merge conflict