Move test class for old deprecated class to match new location