Savanna tests small fixing

1. Increased time for sanity tests
2. Changed parameters for savanna flavors

Change-Id: I9fd0c022c911f7fdf7f2e3af2a39e25f95e1d98d
Merge "Savanna tests small fixing"