Removed XML parser and updated tests, mapper is now responsible for handling the mapping.