Added data directories and test data from Sandro.