MYLOC-59 - Adding more test coverage