MYLOC-59 Adding more tests