Moved test finder into main assembly