4,2: 2,3 test fixed

-renamed files
-no memory flow anymore
-added virtual destructor