maint - making tests slightly more resilient