new mapping tests added, some refactoring, removement of unused properties on data objects