fix unit tests, begin adding color picker