Fix test failures from redesign changes
Merge pull request #1261 from darkwing/david-walsh-is-a-noob-3

Fix test failures from redesign changes