Moved some unit tests to proper packages.