removed unused usings
implemented singleton pattern for generics, made aggregator use it; added tests for singleton patter