Added further tests and outlinded conversion beween data models.