Merge of concurrent and serial test setup. 

Do not merge yet