Fix for issue #21 - rename test files to keep unittests working from install