Add test and organise imports.
Merge duplicate memoizer tests