Add unit tests missed when splitting into separate package.