Added paratest, some improvements