Fixing Generic Testing...