Moved test to appropriate package