ADDED: Junit tests, refactoring for export converter,