test fixes, allowing for correct body matching