Improved verification on a test.
Merged various changes including fixes for generic types registered with the factory.
Various fixes after integration testing.