Cleaned up filenames, improved test document.