This it to reduce the time necessary for these tests. Change-Id: Ibe7a3248a6c45baf575af85fdffcffc557dd054b