Add some options to system_tests

Change-Id: I8238a66d5d80e46c61e2382704749eb9105d53ac
Merge "Add some options to system_tests"