Updated part of the tests for night jobs

Change-Id: I16ded085ea93972c5e50a9873f3063d473f6790d
Merge "Updated part of the tests for night jobs"