Modifying test to (hopefully) run faster.