fix tests...