Added patch to address failed test and also remove padding from Claro theme s...