a number of speedups and test deployment improvements