add new finders, add indices to increase performance; included TestAll in test mask