Code Refactor + Update tests due to style changes
Merge pull request #66 from LandRegistry/am_refactor2

Code Refactor + Update tests due to style changes