Fix broken tests

Memoization is not a good idea