rename some collection variables in the test code
add interesting fields to file view