Commenting tests and font swatch rename.
Merges changes