Made Body interface more explicit
Added tests