Adding back adhoc plan name
Do a full integration test