rename test cases & cleanup dependencies
Merge pull request #1 from KlausTrainer/test-naming

rename test cases & cleanup dependencies