Update calculate state pension logic and tests
Merge pull request #849 from alphagov/state_pension_logic_tests_update

Update calculate state pension logic and tests