fixing unittest issues
fixing unittest issues