Fix for shaky functional test