Few more tests added.
Merge branch 'master' into guid_support

Conflicts:
	src/expressive.annotations.validate.js