Still trying to make these unit tests pass on even very slow machines