colors and a few new tests