Fix timeout and test pollution