updated ttwf shapes tests for new syntax
fixed a search/replace error
Merge pull request #506 from rhauck/pr-485-branch-copy

Pr 485 branch copy