mkt.lookup test fix and refactorings