MYLOC-54 - Completion of tests