adding more tests, renaming file.
Merge pull request #2 from wfreeman/master

adding more tests, renaming file.