Merge pull request #16 from jlambert121/master

basic acceptance tests