* Renamed test-files for consistency
* More unittests