Added test-dictionary file and updated related files.