Added a test directory.
Merging in master.