Introduction of TestData folders for unit testing. Many minor bug fixes