Macaroni Salad and Macaroni cups