State pension calc bugfixes

https://www.pivotaltracker.com/story/show/58420028
Fixes for a couple of bugs found in factcheck.