re-factoring vault functional tests