Fixed ThemeFilter tests
Fixed Resolver tests