Add some tests for expand_all and cleanup
Update data files.

After CodeForBoston weekly hack night, 5/20