Merge "Add vserver creation and fix unit tests"