replacing ExecutorShutdownCondition with lambda, seems like it's quicker(?) so had to bump the test timeouts.