DF fix tests