Unit testing of pid errors
merging conflicts sorted