Put in memoization tests that Mark suggested