Reworking some tests to timeout faster