Pshtetc test race2

After discussion, we decided to change this. He will do this later, in next his merge.