updated ttwf shapes tests for new syntax

@astearns - can you give these a quick look when you get a chance?