speed up test and fix up dependencies in another test