Clean up unit test
Clean up unit test

Metaswitch/calico,neiljerram/felix,neiljerram/felix,alexhersh/calico,TrimBiggs/calico,ocadotechnology/calico,matthewdupre/felix,kasisnu/calico,neiljerram/felix,beddari/calico,TrimBiggs/calico,anortef/calico,matthewdupre/felix,kasisnu/calico,anortef/calico,neiljerram/felix,alexhersh/calico,beddari/calico,ocadotechnology/calico,Metaswitch/calico