Update dev deps
Update test mapper builder
Update gemfile