Working on multi-call tests