Cleanup & add test for AvailabilityMenu