Bugfixes
Acceptance tests for vault