Jzupka prop clean

Here's a few more commits that fix up unittests and rebase against next (which had some other unittest fixes of mine).