fix test code to reflect "tests" directory restructure

Caleb,

I concur with your choice to remove the "tests/unit" subdirectory in a recent commit.  The primary change contained in this pull request is to reflect that restructuring in the test files themselves.

Thanks,

~ Dave