Port over acceptance tests from master.
Merge pull request #140 from apenney/100-tests-test

Port over acceptance tests from master.