Fixed intermittent test problem