Fixing up the EndpointDriver build up from the application under test