4.2: 2,1 tests fixed

-no memory flow anymore
-renamed all files