Updated some test cases for default color scheme.
Improved formatting in certain edge cases.

Closes #188