Fixing shaping tests
Merge branch 'traffic-shaping' into working
Disabling live tests
Merge branch 'traffic-shaping' into working