*** fix tests