changed names of test files so they run after unit tests (?!)
Merge pull request #80 from fleur/master

changed names of test files so they run after unit tests (?!)