MYLOC-61 finishing up tests for now