Fixed crash in test, sped up test time more.