New Tests and some basic edits
Merge pull request #21 from herman-rogers/dev

New Tests and some basic edits