fix vendoring and a test

All tests passing with vendored code.