adding sample entities and mapping and also adding tests