Change specs to use new syntax and clarify intention.
Update specs to new syntax and clarify intent.