Moved MapperTest and supporting code into its own folder
Added validation using Respect/Validation