Fixed last test and WITH-COLORS macro