added some tests for external units
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/tools/Constants.java