fix tests now