moved generic test file into spec directory
updated tests for moved spec file
Merge pull request #158 from Tieske/master

Cleanup of test file location