Merge "Updating Tests with new base color for shades"