A little build speedup, tests enhancements