Bugfix in pathes and removal of test code.