Moved test class to appropriate package.