Fix broken specs.
Remove puts
Merge pull request #1 from jdutil/2-1-WIP

Fix broken specs.