fixed removed unittest funtionality