vbump + test fixes
Merge pull request #2 from lightsofapollo/test-fixes

vbump + test fixes