test fixes
remove ok from responses
remove ok
mapping related changes
mapping changes