Moved tests to appropriate packages.