Automated timeline testing for cloud
Updated some things
Merge pull request #1351 from psav/fix_cloud_timelines

Fix cloud timelines