Skipping a test for now.
Moved stuff around.
makes one file in the generated director
added few more test cases