Updated tests for paratests

Fixed build
Merge remote-tracking branch 'upstream/master'