some bugfixes and updates, a new (empty) test-service is included to make quick tests possible