Fixed models. Added Automapper tests