Refactored api and assert code
Merge pull request #7 from LandRegistry/apitesting_refactor

Refactored api and assert code