Added colors, fixed tests