Fix bug in Poll...Candles and add tests