Update calculate state pension logic and tests

https://www.pivotaltracker.com/story/show/69528248

Additional test coverage for uncapping those who retire after 6 April 2016
Changes to logic.
Small change to yml.