Reworks test stubs to work more nicely with generics
10 files changed