Refactor out unnecessary generics in test
Refactor tests
Refactor tests
Refactor tests
Refactor tests
Cleanup
Make @Nested and @Flatten be @ManagedAnnotation