Clean Test code