Child benefit tax calculator amends

Ongoing work as part of this story https://www.pivotaltracker.com/story/show/53547607