Merging test parallel branch to bhushana:master