cl_tamga_test and small bug fix