added fix tests