flattened test_moving_data
Improved naming of some deferreds