Partial conversion of entity collector
Test class locations updated.