plod tests
merge conflicts solved