Worked on colors and tests