Test map now includes menu