Reworks inner test classes to static inner classes
7 files changed