DF Fixed problem with tests.