Code analysis fixes
Restructured aspect tester
Fun with generics