#4: WIP: Corrected unit tests, reflecting the new memory implementation