Fixes some Menu tests, but some of the others still failing