Put tests in appropriate package.