Added more granulated tests for the xml based persistent storage.
lib folders removed
Merged with the original