Fixed work with test data