Fixing shaping tests