more selective rerender tests

@bug W-2113046@
@rev fabbot@
Merging origin/gtorres/master-pending-rerendertests into master