4,2: tests 1,2 fixed

-renamed files
-added 4 new tests
-no flow memory anymore