Unit test for adding a VIP and fixes