Updates from PyDev: replace pytest with unittest since we're using it in env tests. Fix a merging bug with multiprocess.