MYLOC-59 - Fixing tests