fixes tests and moves files
Merge pull request #9 from dgoodman1224/value

fixes tests and moves files