cleaned up vendored test assets
Merge branch 'master' into next