Make tests run properly