More vendor fiddles (mostly we've commented out unit testing, that's it)