Move test-generic to generic