Repair junit tests for some data involving mock mappers

Also move presentation stuff into another src folder