wrote tests
trying to update to recent changes
Merge pull request #2 from ghidalgo3/master

wrote tests