A bit of reworking.  Made the memory manager more "efficient"
better naming of tests. Fixed the same name twice