Merge "Move trivial unit tests, round II"