Annealing

Update annealing code so it works again, and add test. I could refactor further, but will save for a subsequent PR.