Add extra system test

Change-Id: Ie2477a98877d4010f99a48e78f3dd55427e771a2
Remove no longer supported param from defaulting list

Change-Id: Iba2634880e516330d80734871b809034181e254b