fixing unittest issues 3