Tests fixed.
Pathes changed to refelct moved location of Volkszaehler-classes.
undo last commit (reverse-merged from commit c4927572edf492d89ec14c5fcc94baa4f6dc9a7f)
Pathes changed to refelct moved location of Volkszaehler-classes.