Adding tests around dynamic and mapping