cleanup, spec tests
Merge pull request #1 from jlambert121/master

cleanup, spec tests