Fixed data_tests' tests after refactoring.