More test catalog fixes and updates
More test catalog updates.
Merge pull request #327 from jfurlong/oe4.1.1

Oe4.1.1