updated to be in sync w/ spec 0.4.5.1

and other clean-up
Merge pull request #8 from marv-engine/testreqs

updated to be in sync w/ spec 0.4.5.1