Enhance slow tests