updated specs passing
Merge branch 'master' into updated-tests
Merge pull request #54 from mdidier9/updated-tests

Updated tests