reworking some asserts to avoid timeouts