Better output. New test files