Changed the memory test to use the new class framework