Update tests; make parallel