Remove cruft from pre 3.x
Fix TableResourceTest param