Replace identity mapper with Mapper.class
Remove old test