Separate test module introduced.
XMerge branch 'master' into lab/json

Conflicts:
	pom.xml