Changes for Color Picker and Table Format

Fixed tests that were failing