Merge "Move unit tests, round III"