Samples and tests modified

There are problems with the automapper