Changes to make tests run more reliably, also comment out test that causes OOM errors.