adaptation to tests
Merge remote-tracking branch 'origin/peter2' into peter2

Conflicts:
	src/chord/ChordTest.java