Refactor and tidy up.
Restructure test. Test helpers.