Made the test work with the new structure with convert Mapper